Stop skipping tests that (should) pass on mips*el when we force softpipe

diff --git a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch b/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
deleted file mode 100644 (file)
index 1e312d5..0000000
--- a/debian/patches/debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 2 Sep 2021 23:31:54 +0100
-Subject: Skip some known-failing tests on mips-family architectures
-
-Forwarded: no
----
- testsuite/gsk/meson.build      | 10 ++++++++--
- testsuite/reftests/meson.build | 19 +++++++++++++------
- 2 files changed, 21 insertions(+), 8 deletions(-)
-
-diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
-index 82fe0d5..c780008 100644
---- a/testsuite/gsk/meson.build
-+++ b/testsuite/gsk/meson.build
-@@ -78,9 +78,7 @@ compare_render_tests = [
-   'scale-up-down',
-   'shadow-in-opacity',
-   'texture-url',
--  'repeat',
-   'repeat-no-repeat',
--  'repeat-negative-coords',
-   'repeat-texture',
-   'transform-in-transform',
-   'transform-in-transform-in-transform',
-@@ -88,6 +86,14 @@ compare_render_tests = [
-   'rounded-clip-in-clip-3d', # not really 3d, but cairo fails it
- ]
- 
-+if not host_machine.cpu_family().contains('mips')
-+  # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228
-+  compare_render_tests += [
-+    'repeat',
-+    'repeat-negative-coords',
-+  ]
-+endif
-+
- # these are too sensitive to differences in the renderers
- # to run in ci, but still useful to keep around
- informative_render_tests = [
-diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
-index 2cd31db..e5fe2af 100644
---- a/testsuite/reftests/meson.build
-+++ b/testsuite/reftests/meson.build
-@@ -71,9 +71,6 @@ testdata = [
-   'background-area.css',
-   'background-area.ref.ui',
-   'background-area.ui',
--  'background-blend-mode-clip-interaction.css',
--  'background-blend-mode-clip-interaction.ref.ui',
--  'background-blend-mode-clip-interaction.ui',
-   'background-color-transparent.css',
-   'background-color-transparent.ref.ui',
-   'background-color-transparent.ui',
-@@ -92,9 +89,6 @@ testdata = [
-   'background-position-repeat.ref.ui',
-   'background-position-repeat.ui',
-   'background-position-repeat-bg.png',
--  'background-position-simple.css',
--  'background-position-simple.ref.ui',
--  'background-position-simple.ui',
-   'background-repeat-clip.css',
-   'background-repeat-clip.ref.ui',
-   'background-repeat-clip.ui',
-@@ -606,6 +600,19 @@ xfails = [
-   'border-half-pixel.ui'
- ]
- 
-+if not host_machine.cpu_family().contains('mips')
-+  testdata += [
-+    # https://gitlab.gnome.org/GNOME/gtk/-/issues/4618
-+    'background-blend-mode-clip-interaction.css',
-+    'background-blend-mode-clip-interaction.ref.ui',
-+    'background-blend-mode-clip-interaction.ui',
-+    # https://gitlab.gnome.org/GNOME/gtk/-/issues/4228
-+    'background-position-simple.css',
-+    'background-position-simple.ref.ui',
-+    'background-position-simple.ui',
-+  ]
-+endif
-+
- reftest_env = environment()
- reftest_env.set('GTK_A11Y', 'test')
- reftest_env.set('G_TEST_SRCDIR', meson.current_source_dir())

diff --git a/debian/patches/series b/debian/patches/series
index d076cd073add00718a20286c7358476da17a6b28..018c40f4183f890cdae90daa7ea06873c80206b4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 reftests-Allow-minor-differences-to-be-tolerated.patch
-debian/Skip-some-known-failing-tests-on-mips-family-architecture.patch
 debian/Disable-clipboard-test.patch
 Disable-inscription-markup.ui-reftest.patch